ffd43f
@@ -75,13 +75,13 @@
public class DeploymentServletDefinition extends SimpleResourceDefinition {
         registration.registerMetric(MAX_REQUEST_TIME, new AbstractMetricsHandler() {
             @Override
             void handle(final ModelNode response, final String name, final MetricsHandler.MetricResult metricResult, final ServletInfo servlet) {
-                response.set(metricResult.getMaxRequestTime());
+                response.set((long) metricResult.getMaxRequestTime());
             }
         });
         registration.registerMetric(MIN_REQUEST_TIME, new AbstractMetricsHandler() {
             @Override
             void handle(final ModelNode response, final String name, final MetricsHandler.MetricResult metricResult, final ServletInfo servlet) {
-                response.set(metricResult.getMinRequestTime());
+                response.set((long) metricResult.getMinRequestTime());
             }
         });
         registration.registerMetric(TOTAL_REQUEST_TIME, new AbstractMetricsHandler() {
@@ -103,6 +103,11 @@
public class DeploymentServletDefinition extends SimpleResourceDefinition {
                     response.add(mapping);
                 }
             }
+
+            @Override
+            void putDefault(ModelNode response) {
+                response.setEmptyList();
+            }
         });
     }
 
@@ -110,6 +115,10 @@
public class DeploymentServletDefinition extends SimpleResourceDefinition {
 
         abstract void handle(ModelNode response, String name, MetricsHandler.MetricResult metricResult, ServletInfo infos);
 
+        void putDefault(ModelNode response) {
+            response.set(0L);
+        }
+
         @Override
         public void execute(final OperationContext context, final ModelNode operation) throws OperationFailedException {
             final PathAddress address = PathAddress.pathAddress(operation.get(ModelDescriptionConstants.OP_ADDR));
@@ -137,7 +146,7 @@
public class DeploymentServletDefinition extends SimpleResourceDefinition {
                     final ModelNode response = new ModelNode();
                     MetricsHandler.MetricResult result = collector != null ? collector.getMetrics(name) : null;
                     if (result == null) {
-                        response.set(0);
+                        putDefault(response);
                     } else {
                         handle(response, name, result, servlet);
                     }
